From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 19 Aug 2009 07:14:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11020
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=26d544bb4181e4ef400b247b83db5db365544b01;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 159fcb668dd..273d531ed35 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -836,8 +836,8 @@ name of the property, and its value.  If there are no properties,
 ;; descriptors to input_wait_mask, in order to detect incoming
 ;; messages immediately.
 (dbus-ignore-errors
-  (dbus-init-bus :system)
   (when (getenv "DBUS_SESSION_BUS_ADDRESS")
+    (dbus-init-bus :system)
     (dbus-init-bus :session)))
 
 (provide 'dbus)